From e603cdbe5d441feb8088bef224547aa1b616d409 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 21 Jul 2019 18:55:13 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 465950 -> 466090 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index c416f3e0a3e..86eef7406b1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -82,6 +82,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index b626b72cb0d8e1029db2bb7f15bedd1d6cb5ef2c..27b795890775365950708c9038698f3f09b9ea1b 100644 GIT binary patch delta 168 zcmbQYLuS=ZnT8g|7N!>F7M3lnO?T@v(-cZli%S%AD-`rgi;MJ=GV}CP3bNC6lS(sl zQqpn~(~GSYN-|ROxD+73!!gLk)i2&TAi&MX(LLBU0Zp}nu5Nm2i2_Vs!N^WOCACaH muQVqofh#SO%h5SLIMgXPL<4LP7s90W`n#;#>+iD7w*vsyB{$;$ delta 29 lcmZ3rQ)b={nT8g|7N!>F7M3lnO?TV*?y+v?yT>-i4gj*G3!eZ0 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 88904117200..6e6cc5a92f3 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -255,6 +255,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2